* frame.c (x_set_font): Remove unused variable.

diff --git a/src/ChangeLog b/src/ChangeLog
index dc6a02d7faf6139af1bb9e2c000dc852eac22870..ccc3e480eb9c1e1a9ce16b970dfca633d99f8516 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-03  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * frame.c (x_set_font): Remove unused variable.
+
 2010-12-02  Jan Djärv  <jan.h.d@swipnet.se>
 
        * nsmenu.m (update_frame_tool_bar): Remove NSLog on invalid image.

diff --git a/src/frame.c b/src/frame.c
index ba675be5b5f7219aab8c3f28081255b82db7f35b..6cf46f1a0ba4a15515f5265a06fc9086d92de8bf 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -3311,7 +3311,7 @@ x_set_screen_gamma (struct frame *f, Lisp_Object new_value, Lisp_Object old_valu
 void
 x_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
 {
-  Lisp_Object frame, font_object, font_param = Qnil;
+  Lisp_Object font_object, font_param = Qnil;
   int fontset = -1;
 
   /* Set the frame parameter back to the old value because we may